Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: skip dependencies on openshift platform #1921

Merged

Conversation

frzifus
Copy link
Member

@frzifus frzifus commented May 30, 2022

Signed-off-by: Benedikt Bongartz [email protected]

Which problem is this PR solving?

  • Prevent write to dependency store on openshift platform. (currently this does not work because permissions are limited)

Short description of the changes

  • When using openshift, the dependency index rollover is disabled.

cc @rubenvp8510

@frzifus frzifus marked this pull request as ready for review May 30, 2022 20:54
@codecov
Copy link

codecov bot commented May 30, 2022

Codecov Report

Merging #1921 (b2cdcdf) into main (5044aa9) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #1921   +/-   ##
=======================================
  Coverage   88.25%   88.26%           
=======================================
  Files         100      100           
  Lines        6303     6307    +4     
=======================================
+ Hits         5563     5567    +4     
  Misses        543      543           
  Partials      197      197           
Impacted Files Coverage Δ
pkg/cronjob/es_rollover.go 79.26% <100.00%> (+0.51%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5044aa9...b2cdcdf. Read the comment docs.

@@ -213,6 +213,13 @@ func EsScriptEnvVars(opts v1.Options) []corev1.EnvVar {
envs = append(envs, corev1.EnvVar{Name: x.envVar, Value: val})
}
}

if val, ok := options["skip-dependencies"]; ok {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to add the environment var if the option is specified?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For cronjobs, only selected parameters are passed as environment variables. Here we pass user settings if they exist. If no user settings are present and the operator runs on openshift, we set skip-dependencies=true.

Details: #1896 (comment)

@frzifus frzifus requested a review from rubenvp8510 May 31, 2022 08:12
@rubenvp8510 rubenvp8510 merged commit e17fa17 into jaegertracing:main May 31, 2022
@frzifus frzifus deleted the fix/skip_dependencies_on_openshift branch June 1, 2022 07:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants